Progress commit.  Fix rendering, I think! & loads of debug stuff.