WIP: refactor of first solution