Re organized the file a bit, only a first of many changes