big changes.  still very rough