Fixed loading order, started work on location watching