Finally reorganized and have working *most* of the new UI Features