Got rid of "resolved" classes.  Really cleaned up formats