Fixed staging bugs in develop branch
check in for hw6 part 1