Implementing feature #17. Last part, refactored admin resource