Start removing race conditions lifecycle

This partially accomplished by removing the race condtions, and
partially acommplished by moving the race conditions into the UI.