Make worky

Technically this now has complete functionality. However it is ugly as s***. Not
the nice s*** which <remainder redacted>
Tweaks

A couple fixes which help it work after the abortive work on additional shells.
Adding the old server version for posterity.