Feature/master/visitable objects

This is based on GH-221, and provides a base for work needed for GH-95.