Preliminary code for marking functionality, revised location service for better compatibility for marks functionality