closing in on re-arrange code...