Started breaking out repeat code into methods...