still need the getters and setters
Added stuff