More work, still not working properly