Rough layout for location
Merge branch 'master' of https://github.com/mrfuzzemz/project6858.git
Rough layout for location