Working commit before building new UI in separate project.