massive overhaul and streamline.. see email sent out