Major Edit 1

Got rid of all the automation to get right into it