Cleaned up Master lifecycle code.  Added event firing with pre/post.