Complete re-work of assetLoading and asset handling