Improve method
Couple goodies
Clean
Match the other variations of this method (assingment / entry models)
Don't spawn new each time
Clean up