Commit missing bits from 'first version'