Whoops
Revert "Whoops"

This reverts commit ccc700a29a4d32bad784fa2adf4100899b4f608d.
Revert "Revert "Whoops""

This reverts commit 38e8381e8a4dc36bdb5de0bcbb719c19fdaea56a.
Added ning command, also fixed a conflict in the admin plugin