Passing smoke-test WIP