Cleaned up to try a new UI approach.