Closes #72 work flow and closes #70