Added initial work for the router and fields