more or less done - implementing CLI