Stuff

Stuff done thus far, more to come...
More Stuff

More stuff, little more incoming...
Fix merge conflicts