removed a lot of uneeded lines of code, moving to new branch