Catbox 4.0. Closes #1954 Closes #2019