Started converting router feature to living example