fixed map and began integrating controller