move stuff around, almost everything is class based now, slightly prettier