Cleaned up recent work; StaffInfo prototype in separate file.