working on post logic on router.
fixing merge conflicts.