Modularise and add class with initializer for token. Add basic passing tests