dn - More Refactoring + Initial Half-baked CLI code