Updating specs, adding CLI