remove group hack from TODO
add is_admin
add admin support