Some log in improvements.
Fixing dependencies.
Save shapes to model