added rules for rounds 1-3 and refactored

I know our tests should have come first.... but I couldn't help myself