Made sure everything was modular and added getters and setters.