#39 Initial work on Ident reform