Solved #22. Preps for #23 added.