better routes
Implemented mapper
Some improvements & added test application