v2-Initial groundwork for new UI
tmp