First complete draft of API along w/ CLI client