Yay additions!

Less fixes = more additions = more fixes!