I made some more shit work
Merge branch 'fuckyoudiego' of github.com:dwaxemberg/interpreter into fuckyoudiego

* 'fuckyoudiego' of github.com:dwaxemberg/interpreter:
  i fix it... i think
Stuff that works