IMPORTANT  The mapper classes are not yet completed - when they are appropriate test classes will need to be written