Done for now; reloading bug left