Still not working, but maybe a bit closer