More fixing the roster

Hadn't saved ... so just filling in the rest of the commits
Refactored FlipFormToRead to get passed a form

Note that PHP needs to specify the form