Final Touches Made. Now to merge with main