changes to Makefile, identified places for incorporating stage 6 changes, created corressponding place holders for stage 6 in manager.h