everything merged with Sean's repo