Revision 2

Revision 2 of New Roll v2. Slimmed down and enhanced.