Project 2 Third Draft

Added currentLocation to keep track of location