[dmurray]

Hope this refactor was well unit tested, because it looks to do something a lot different from the original code.