WIP: The mother pull request - rewrite ncb

See below