@harding I'll work on it more and submit a pull req for review when ready, thanks for the feedback!