Issue #2 (partially)

Workable admin console, but now with no macro support.