Rewrite Code Infrastructure

For the more general data set that is this cancer set