Add a bunch of necessary portions for running