Waiver
Succesfully implemented waiver functionality.

It still needs some cleanup work but, basic functionality is there. Ready to merge with master.