#39 Another intermediate commit on Idents
#39 Fix Ident stuff enough to pass tests