Map works, need to add Places and better integration