Updated base files, improved routing. Not yet done, time to sleep ZZzz