Reorganized the features a bit.