WIP - updates logic to sign properly
WIP