Folding Methods by aitskovi

This is #338 with the notes addressed.

@aitskovi I hope you don't mind! I wanted to get this in ASAP and it was mostly just style notes.