Hackery on the new stuff