master
this commit is way overdue. Basically, I tried to do everything all at once in a singl branch. It didn't work well.