This is fantastic. Feels like something that should've been in there from the start!