cleaned up the stop model and provider pattern;