start shuffling things around:
reworking everything, as classes