new features.  more cleanup coming soon.