WIP on run methods and tests