big commit, first version draft