Uncommtted changes from when I left off...not sure of status.