Added getter and setters and thigns aswell