Many changes and added files, along with a poor commit message :)