Updated quiet a bit, mostly adding the CLI interface