WIP: collections plus navigator