HUGE clean out and JB Additions