Refactorin + some progress on adding get token stuff