Refactored code, better organization. Networking still needs work