Head works again

I hope.... somehow the merging bugged out.