Iss 22

Improvements to parser, timeline.
These if statements. We should comment them out since we're not using them right now.