Almost got the getters/setters done