Updated my TODO list of things to improve with this.