additions to admin + updated TODO