Updated classes to contain location info
screwed around with mainactivity (we really need to fix this)