Commenting out and moving some things around so the code is more organized