Rough pass, but I think the routes are solid, needs to be cleaned up, but commiting for posterity so we don't loose the progress.