Revert "Revert "wip- re-load, sort of.""

This reverts commit f7f6faa7946e1d07ae202ad955d06ca15395cf9d.