Started Refactoring To Support A New UI