cadre additions and a little more fleshed out