Implemented more of the features from the paper.