Added big massive TODOs on a huge design problem with initial sync