Final Take

Added missing pieces and comments