2.x branch started

New features coming.  This is definitely the beginning of 2.x