progress on registration back-end
 merge