Putting Ryan's Things Back

Put the classes ryan worked on back in. Ryan