changes so far uncommitted
current draft