Some further prototyping.