Basically First Commit
Some more cleanup
More massaging
fixed some errorz