Reworked classes, works fine.