Add the large percentage of stuff that I forgot to commit yesterday