Move current location acquisition to controller