Updated setters to refresh UI. Began annotation work.