Added Overwrite Logic
Everything working

Finally got everything working