more refacctoring to prepare registration for use in dreamteam