Moved Some Code Around.