For some reason two new classes didn't commit. Here they are.