Moving lots and lots of stuff around!
nah, just moving the tokens to each sub-action
also I was passing the wrong token on closing a report

Signed-off-by: Suki <suki@missallsunday.com>