James Work 7/10/14

-API rework
-Editable content