Using own router and cleaned up environment a bit