I've started working on this. Please, don't change those files until the pull request is sent. Thanks!