Fix and neaten
Trying out use of autoReactify to remove getters/setters
Updated reactive