Moved Code to Solution