added cleaned up tokens, refactored for better imports
Merge remote-tracking branch 'remotes/origin/keelan' into keelan