completed version 2; ready for staging deployment