refactor registration process; start org testing