Adding Bill's stuff to project