More data! and some changes to loading.