Eventually managed to finish these up, just extended capcity and a small anti slosh plate, not quite...