Pretty much done. Except for router login stuff
Why won't it merge?