General Update

NOTE: This probably isn't a compileable version.  Just a rolling push
not to lose work.