Changes from this morning so brad can see them

Note that this should resolve #148
resolved #48, rumorgenerator is doneish