now using template parser class and tests pass 87