Initial Refactoring Is Ready to add another UI