More progress with admin, started on scores