Rework some data and syntax internals
Start work on parsing