Bringing my Fork up to date with aogilvie's