Feature. Staff Controller and Staff storage class.
A few fixes. Nothing specil, see diff for details.