probably should've committed this stuff a while ago