Changed the main script to run all things