I pushed some code, see my last comment