Getter and setters completed (3.28.13)