Tryiung the non-cm branch

Signed-off-by: Randy DuCharme <radio.ad5gb@gmail.com>