That's Better...

Massive changes. Actually a fairly smooth experience now, needs a
hammering in a nearly-production-ready live environment