Final Commit V4

Full and final with minor cosmetic changes