starting typepicker refactor