This commit isn't doing anything, just trying to figure out how to do this correctly