basic admin functionality
fix merge conflicts