Introduced setters and getters

Still need to add some