Doing some clean up and working on adding more session flash.