Beginnings of making this sane