Got generic parsing code working