Cleaned up modeler
Add data