A series of annoying changes to String Parsing Code
Finished fixing errors, still looking for a memory leak
Fixed merge conflict, merged changes