Finalised version of cli interface