Updated files so that they compile

I may have broken some stuff.