Add fill code, cleanup of coldstart.