Huge update, almost done
Update