-- NOT COMPLETE --
Update to change setters to properties