Updated design to match finish Simon.java code.
Updated design to match completed code.