FIX Layout:  come up with correct number of axes (&TEST)