Model redesign

Changed from record to object. (But its late at night so this can become
anything)