Change to lazy initialize.
Change to speed up and ensure thorough testing.