add keys
Add flags support
Implement browse
Implement resolve