Large commit since getting internet back...