Refactoring - move now working.  Still spectacularly bug ridden :/