KFSQA-628 pushing changes to get tony's stuff for code review today