stage 2 almost done, secret key problem solved
Merge branch 'stage2'