#4585 is not fleshed out enough (especially given that John isn't starting on it in the next two weeks, and someone else might need to)