Built out the scaffold functions and added many class variables