Final Push

Accidentally deleted and re-added some files in sending it to Jay so it
seems to have considered everything new.  Only some minor changes were
made, mainly removing things like superfluous constructors