Fix the pipeline!

Not sure about the todos. Those can be dropped or addressed, I just want eyes on them.