-Initial Commit of Mapper and Tests