Starting To Bring Features Back

Starting To Bring Features Back that had to be reworked due to the
addition of networking.