Oops - set up options/commands properly