Updated Trie and TrieNode structures

These will need to be tweaked, but I think the main framework is there.