Hacking more
More hacking, and some cleanup