Rounding out router functionality, updated conf sub structs