Completed the mappingHandler, started implementation in the main file