Still not working, but getting close