Added working map functionality with UI partially complete