More work needed but it's a decent start.