Rethinking my workflow a bit