Punishment system almost done