updates
refactoring more
updates
fix for now
taking global variables out of partials