Sounds good to me :] I'd like to get this functionality pulled in before we work on the refactor