Pushing this nasty hack for Will, refactoring begins now