Demo working -- lots of changes