Huge update. All commits