Last step before going to try to start over and simplify the code