Rework

Possible fix for #1
Possible fix for #2
Less server hijacking