all tokens added
everythign done but odd bug
Dumb git bugs??