Added cmd line for simpler features, but TODO