Finished making all classes use getters and setters