Rearranging solution

closes #11