A bunch of argument tokenization stuff
Added some failing tests as a todo list :)