Working, commented up (mostly).