Moving coding into solution