ha, got a repo for #90
less name pollution
change the model for #90 to what it should probably be