Almost a final implementation of scoops, still not quite right placements