Working implementation (besides dates)

Had to change the parser a bit, and do more grouping work afterwards.