In class; Haven't tested. Minor changes for admin interface