Starting the process of refactoring to support 10.0+