Beginnings of a more abstracted saving framework for including the full
boundary. Still some work to be done.