Got token stuff working