attempting to consolidate

6 more pages still need to be added I'll make them tonight