Done a bunch on the source tree and started working on registered blocks