Initial Commit
Implemented mapping and its testing