Much simplified version; data driven, not logic driven
Improve Kata validation