working changes
preliminaty models complete