Bump, this is almost done. I'm going to finish this when I get back from my Exams this evening. Anything that anyone sees that needs to be added?

(Sorry for the Double Post)