Cleaning Code Up
Going To Re-Think This Idea