Getting closer to doing things correctly.