More modifications. progress.
I don't want to test this