Commit 32 + Add Roster Rework