Initial combination of the two codebases

Oh god how badly is this going to fail hold me I'm scared