refactored some stuff, tried implementing reload
28-1 nightly dev