More progress integrating skrollr

This version is not in a working state