Moved tokeniser to seperate file