Refactored for CodeKit and Fabric