Still doing that number fix, trouble merging