Testing

merge working testing branch back to mainline