Refactoring
Refactoring
Clean up
Sidebar syncing take 1