It partially works.  Some more hacking again