draft of first part, also changes to models