Now disposing items appropriately
Merge branch 'phase3'