update makefile
move tokenizing code to parser