Cleanup
Made everything run through python. Much cleaner.