Loader (finished) and Router added