Lots of progress, but not working yet