Re-organized a bit.