Commit before merge. Making a copy of RNBTest main.h/.c code.