Design test #1
-- major rewrite --