Filled out template of parser a bit
Added operators to scanner and explicitly put types in header