Final Updates. Refactored Code to remove custom editing property