...
Seems to be working a bit more, need to resolve transition and codename 'email' and it's structure card