changed the Token struct

think this might work more like Bryce wants it.