Finishing recreating old v0.1.0 functionality in refactor.