Include challenge issuing and resolution

The code runs, but the aren't correct yet