Refactored token service to properly manage tokens.  Squashed mybatis errors.