Broken code. Checking in because I've got to switch dev environments. The
future is bleak.

I will fix install shortly, everything is jumbled while attempting these
changes.