Use XBlock rather than XModuleDescriptor for access checks
Use XBlocks instead of XModules when loading
WIP