Added some more tokens
Token enum list is on a single line
Did some refactoring, added poc
Started work on final component