Adding remaining code, not in the build as of yet, just checked in.