Workflow revisions

These are some rough commits based off discussions on 4/2. These should be further revised before merging.