Merge map generator into main codebase
Fix map generator to work with annotations
Make everything work with the new mapgen code
Ability to call pop methods on this (only works when using a local
variable that points to this