wall is done (I think) way simpler than before