Commit outstanding code before rethink.
Commit outstanding code before rethink.
Fixed merge issues