Completed initial mapping

now time to fix bugs.