[#50856951, #50649193, #50649235] Initial hacking away!