Spinning out Jeff's remaining code into it's own files