I'd like to see this or something like it in 2.o as well