Add all drawing functions to parser, order them, clean unused functions
add some comments