Commit 33 + Bug Fixes on new Add Roster