Added initial work for the router an dfields