ugh, moving into seperate if statements