@bjornmeansbear is starting to figure things out
ss
fix merge problems