Week6

Man, refactoring was way too much fun :s

Kind of wish I had started somewhat earlier, but meh -- pains and diseases don't always let one.