Add marginalize; world-tracker