Rearranging the signup order; closes #5