This is the first of two commits (didn't want to dump them all into the