More work on demo + some helper classes