EVERYTHING IS FIXED
now we need to make it work the way we want it to.