Added bench stuff from Stephanie.
Fixed include paths.