commented out some stuff
added getters and setters