Add better CLI interface and storage options
0.0.6