First Final Round of changes

This should also be the last round of changes