Basic logic imporvements.
Removed networking from logic.