Most router stuff fleshed out