added some basic tokenizing etc