Initial WIP
.
Improve replay prevention