Moar gems
Reworking classes