Made some tweaks trying to get the loading / unloading working