Snapshot before I rip out signing
Probably the final version