Pull in travis's picture stuff