[refactor] Working on updating this for Maveriks