Partial Refactor for Self Service (BROKEN)