Working on merging my fork