I screwed something up

Here is a fresh version, hopefully this won't
break more stuff.