add routing - first stage (fixes are needed)