Latest pre-demo work

Now shows live data