more parts of the initial commit