Move stuff out of prototype + prepare data browser