More work towards #2 amnd #14