Began refactor of staff to its own component