Some fixes + first draft of Chakart (just thoughts for now)