Rewrote state/route builder

Non-working example, this is just an API experiment.