added admin functionality
merging latest repo with admin functions