Continuing to implement reassign/unasssign...
Merged changes.