working on redoing router macro