All the stuff that I forgot to commit