updated using the cpp.. Still need to figure out the formats of everything then push comments onto it