More steps towards abstracting away the representation.