Did a lot of stuff. Proof of good pepper disbursement and replacement
Fixed merge conflicts.