stuff we all worked on 6/28