Adding more functionality.
Fixed a merge conflict.
Still trying to merge.
Why is this not merging?