[SPARKL-39] WIP