Moved setMap and setLocation to FSM

This is good.