partial commit

partial commit so that I can continue working on my other development
environment.