milner update
milner commit before xmas, working versions
merge