Add location controller
Branch catchup