Everything Working , Merge to Master