Finished a raw parser

Finished a raw parser