Addressing @jeremy's comments; this is beginning to look very nice