Content scan overhaul (incomplete)