The rest of the steps are now initially implemented with some cleanup still needed.