Added setters
Starting stuff