PoC7 updates plus initial (probably buggy) code for def