Tried to fix method router .. this failed. More work needed