Friday/Monday

Combo commit, because my internet went down on Friday and I couldn’t
reconnect