merged project with parser, added void pointers