Added all the work I didn't commit in weeks. All these commits are just too much to comment on.