moving all into partials