Preparations for demoing. Includes first data structures
Merge branch 'master' of gh:/dadarakt/jamon