First pass at dynamic route segments. Refactor