Some provisional base functionality for [#160]