Added a bit more for core but realized limitations of workflow system for creating/maintaining workflows. Will be fixing first.