still working on nonce issues :/