Perhaps we should finally start having some tests and begin with this...