Moved imports out of model.ty file
Add TODO's for documentation
Removed whitespace