Got rid of fixed classes, needs more testing.