Almost finished debugging the last of the parsing!