FINAL commit for PS1b

This is the version we turned in.