Hackery in progress, but at least in compiles