Preparing to implement final piece of code for WPA build.