Integrated WIP version of Spock