Added basic marker functionality
Completed marker functionality