Refactoring partials
Good progress. Default form almost essentially finished.