Merge shit

Stuff josh/ben did