Engine refactored, currently refactoring admin actions