Added most parsing functionality, more unit testing needed
initial testing on full module completed