More bending over for style cop. Pretty sure I've covered everything. Now needs unit tests... ugh.