Solved to #27; working on #28.