@TehMillhouse  Hi CLA signed I will try to push refactored code tomorrow.