moved some back end code, need  Nick's UI