Initial data port to 2x scale
Merge pull request #2 from igorko/master

Some initial data port to 2x scale