A whole bunch of work.

And its really late. So to hell with the commit messages.
removed nib