Added features discussed in pre-demo work