First attempts at Entity.extend method usage; updates some some demo files