More progress, no idea if we are working yet