Second half of battery. Also added validation tests.