Code Clean Up. Also Begining Graphical Update.