Renamed functions to fit into the API style
Added from-keyword, updated prepare
Finished location API implementation