renamed options to mapping
fixed to work with mappingBuilder
Should have run tests... fixed bug
Reworked first test and fixed bug