Bulletproofed what I've done so far.