wip - better, but still not working.