Cleaning up code, added a mapper component that has yet to be tested.