RollInit

Initial Roll V2 commit
Fixes

Fixed some issues
Merge pull request #1 from ccubed/master

RollInit