Merging dev changes

Completed fully dynamic algorithm.