Added some new stuff for pair programming