Last commit for the night after tweaking a few bits of code, spacing, brackets and such.