A few new stuff and changes to make stuff a lot easier in the future