Dominic: Make it actually work