Interim commit, compiles. We need to bring in support code now.

Signed-off-by: Ronald G. Minnich <rminnich@google.com>