Working on cleaning ui, watch for temp variables