Start to add tests, think about how parsing is going to work. Things still really borked. Wow this is old code.