Feature/eschrock/list demo