Move parsing into seperate parser class