Start cleaning up BlockListener.
Rearrange order of listeners in attempt to fix errors on startup.