Administration added. Seems ok - not fully tested (hidden)