cleaning up the nasty dodgy merge push pull that just happened
more clean up - PS & shuff working only still