Improved parser almost complete, needs whitespace handling