Initial commit of location logic