Major rework, started network play
cleanup