Initial changes; first new functionality. Probably doesn't run.