CLI now works