Refactoring Desire system to support the notion of Attain/Retain types. Improved DM target filtering options, with specific source options for Units and SO types Draft "manage items" goal data