Dev

Merge dev into master now that things are (mostly) working