Added Map state and WIP Town state