Lots of changes to boundary classes and their outside interface.