Machen/fix pipeline

Just mucking about, probably need to comment some stuff.