Began work on location checking