started work on better parsing/shorthand parsing
WIP
Merge branch 'better-parsing'