Added setup and TODO