Still refactoring workflow a bit