i agree with you here i'm going to propose a serious overhaul outlined below