This may have been fun, but it is also good. Well done. Polish those rough spots.
In a related issue, you once mentioned that you should add WOL requests in more spots to get that working better. If my HTPC Server is asleep and I start a Client via direct LAN IP connection, which should be a faster method, WOL messages are not issued. To wake the Server I need to use the Access Key method, which in turn needs access to the internet or takes a long time before it decides to use the last information it had, so the whole process is much slower. I don't think I should need to have access to the internet in order to wake a Server on my LAN.
That is a rough spot that I think could do with some polishing.