working #4 - rosters

actually reworked a ton of shit ... still. it's all around the roster