More ch 12

Probably will do a bit more later tonight so I can knock this thing out.