basic parsing into tokens
weird merge, but compiles