Lots of work to get ui up and running again