port more of the common.model (doesn't run)