Tearing down the old

This version is crappier than master, but it's on the way towards something
good.