Hackishly finalizes things for initial demo