Attempted changes to work around chunk loading issues (still not done right)