further progressed adding on admin elements