Jconnor better control callbacks master

This are the better control callbacks that I implemented in pulp-2.0, but we decided to push off until we merged back into master