Fixing some logic after removing all the over designs. Cannot comipl yet, don't pull this.