Fix containment bug
Refactor using promises.
Add Makefile to support test debugging.