I'm fine with doing that in another pull request/version as I wasn't planning on doing anything too advanced in this first version. Is that fine?