First pass at CLI tools