restructured app, reactivity working.