cleaning up syntax and adding ability to drag features to change their position (partial, unsaved at present)