Removed an unneeded String, and added Cranked variables
A Few fixes, and moving a class