big commit, start of serious works