version 1, assignment 7.1

move if/else statements on assignment 3.1 to one line.
assignment 6.1 and 7.1 are still pending
i think just doing a lookup is all that's necessary here though.