Cleaning up token logic, starting to implement overrides