Changes 1/4 A

Added getters and setters