experiment
Better integration
Added support for model
better separation, names, etc.