some TODO updated, selection operators stubbed