This branch has become a giant mess, moving to master before this turns into a Fiendfyre