Resolves #81 (I made a decision for now), Resolves #16 (though will eventually need updating)