app working with token… not ideal, will need refactoring.