Re-worked the staffnote infrastructure