Cleaned up some commented out shit
Updated with design