Huge update, almost ready