Reorganized the features and cleaned them up.  Getting ready to start fleshing out the features that are already built.