Major progress towards the non-containment reference. Updates for issue
#20.