renamed some things also got partials inside partials to work right