Adding new files

Haven't commited in a while, this will include a bunch of updates