Finish moving everything into parials