History intial version + better router