I wonder if we can make this part of the 'Cylon' namespace...