work in progress t. toby
merging