* Begin Refactoring Architecture to OO Style