Preparing for some new changes

Redid a lot of the functions and setup process to automate it more.