new UI now works but implementation is meh