Added New Item
Removed uneeded code and did some organization
Losing Confidence in the design again .... Going to go for a simpler one.