Start working through the resolution code to clean it up.
Clean up zone cache a bit.
Update license year.