98% sure I fixed my hard links: Safe to merge