comment out testing procedures
glue parse and deriv together
add comments and reindent code