Committed solution changes. Woops.