interim commit: json / dictionary instead of classes