Added double parser
Fixed todo tags