More work needs to be done, but this is a start.