More separation into partials/adding boilerplate stuff