KWIC+ Software Architecture Project 2