Making progress

Still a bug, loop seems to stop for nothing ...