some more general setup
Added partials
Merging master into fork.