Willcomptest

***merge willie code into comp code on a branch***