Start converting code to use static