9/10 test cases working. Complex scenario for expr working but needs minor tweaking.