The full monty

One PR to rule them all