Partial update. This might not be a stable commit but wanted to go ahead and pushes these so I can check out from another machine.