9/17 Reorgainizing

Will not run as it is. Still working on fixing up the code.