Need to push changes due to laptop failure.

Hopefully will get a new one and continue work soon.