Fixed up call expressions, needed a small hack and now single values are repesented by binary_op, but it will work
Basic if-then branching working