reorganizing things
no idea what i'm doing