omgz a shit tonne
more slides etc.
fixed conflicts