Started refactor to remove remaining business logic from UI