I will eventually, but still want to make it a bit more flexible.