A whitespace commit? really?
Initial work on parser