23_Josh sorting out some parts and pieces