Putting in place the real core for admin