Slowly making the class layout less stupid