possible revert point before i start renaming things