Merging towbase to create new master baseline

We're going to integrate these two configs using the towbase as a start point as it's slimmer so should be faster to build into.