PWS-172 #comment Refactored handlers to make datastructure code more
concise.
PWS-172 #comment Applied refactoring to all handlers
PWS-172 #comment DS population code now in handlers.