saving here, going to backup to master and try another rework