These need significant changes to match my workflows, but without the base settings in place doing any work is really difficult. So copying over the basics, I will re-arrange and update everything in later commits.
