Minor further prototyping and tests