I'd also rather this took definitive options rather than a hash...