still pluggin away at the integration of new UI