Parse function completed.
Renamed a few things