Second commit since I forgot some of the files. This is another first commit to allow for all the core files to load.