Restructured my code a little so everything is easier to find