Final version, all logic implemented IAW spec.