Rework

breaky break break, getting things cued for 0.9.0 release.