Revert "Simplified the setup a bit"
Revert "Simplified the setup a bit"

This reverts commit c53f9c69b9fdb60bc6fa7b587ab38977a9a63342.

CMPUT301W15T07/TravelTracker,CMPUT301W15T07/TravelTracker,CMPUT301W15T07/TravelTracker