Pulled some execute code into construct_statement method