tons of changes so i can move forward