Did some more class design