So much so that I think we only need one or the other. As such, I'm
implementing the functionality that is in one of the classes so that
(and vice versa) might eventually be able to use the same class!

Change-Id: I1b32a5a5213ea406a96386ac4a4553cd81d3728d