Big refactoring needed
Start on handling errors/undefineds better
Fix a couple parser fixes