More classes and fixies and changes