First commit that kinda works
A almost working version that has some pitfalls

This serves as a checkpoint to go back to
A commit that seems to work after all those changes