Initial classes
Finished Parser
Merge branch 'Oliver' to include Parser