Extensive changes

- Focussed on adding reactivity