Adding more of the base functionality needed to set up API