Changes to make it even more modular
Fix crash, fiddle with routing and do some cleanup