(temp commit) more type safety conversion work