Heavy design overhaul. Perhaps 70% done.