Continue expansion; alpha work on NewUI