Filed bug 1100155
Continued work on refactor