Added constant parsing. More work in progres..