This needs to include Aaron's code -----

attempting to merge....