Adding Dirk's initial work.