Start work on ui, add more debug logging