More work on type system ; start of demo