Changed over to smart pointers
Work on statement