Can almost run a test again :)
Start moving parsing of sigs to control