backup commit

With bugs to solve