make OO
Merge pull request #23 from monicaedavidson/lilybranch

make OO