Changed names for the mappings, changed minor things, getting ready