initial work for migrating to encapsulating points