Putt code Together in Same File

Warning: Still needs to be fixed. Has errors