refactor part 1 - it's broken but I just want to keepy my github streak...oops