Quotemunk!

Hey Rebecca,
Please code review!
Thanks!
Never include commented out code in master.