Intermediate commit

Saving current changes before merging with Wolfgang's update