Made more progress on converting to Noeval Application.