Thursafternoon4

see commits below