Enable reloading and add some TODO stuff