some CS issues.
tweaks and fixes.
lazy add of mf2 to the project
some additional classes that we will be using
remove superfluous file
commit changes before I lose them.