6/25 commit 5

hack night edits 1