It ain't pretty
Still ugly; now working
Revert from bad packages
Merge branch 'turn-into-real-package'