LOTS OF CLASS DRIVEN LOGIC! WOOO!
Hopefully merges my changes with Du and Andrew's
Merge branch 'EditorAPI_Integration' of https://github.com/Watson-Reboot-Project/JavaScriptLab-Sandbox into EditorAPI_Integration