Large amount of changes after live LAN test. Also forgot to commit changes before LAN, so this is a pretty big commit