Katrina

- Wrote tests and refactored during our session with Katrina.