Cleaned up the code and started the base for parsing.