Added key strings, started fleshing out raw input parser a bit more.