Most of the files that I've been working on

I'll clean this up later.