added TODO and have all sync up except for server connection