All sorts of class shuffling and untested changes.