wip roster rewrite