Pushing more changes so I can pick it up on PDT tomorrow