All final commits

All commits final_version for hand in