Running late on this one. Initial commit for 7 and 8.
All bugs have been splatted, though at the cost of hair.