Tim: This code should now look more like what Andy expects from his code...