progress on gaedcke - not finished