Finished unit tests and almost done with functional. All passing so far.
Addressed merge conflict.